Auto merge of #1483 - tamird:rustup, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 5 Apr 2015 06:21:52 +0000 (06:21 +0000)
committerbors <bors@rust-lang.org>
Sun, 5 Apr 2015 06:21:52 +0000 (06:21 +0000)
commit366784de4f1f23f62b7224f8a0896eb06d80518a
tree82544f1a28bbdfbd23b40957d249e34766be235e
parentd71f7487cbd51cb5933735a553836bcb82e27f08
parenta5337f32c69cf51425a3ba6190a0d2d881cda8c9
Auto merge of #1483 - tamird:rustup, r=alexcrichton

Passes `make test` locally. r? @alexcrichton